Imported Upstream version 2016.7
authorSimon McVittie <smcv@debian.org>
Sat, 16 Jul 2016 20:06:34 +0000 (21:06 +0100)
committerSimon McVittie <smcv@debian.org>
Sat, 16 Jul 2016 20:06:34 +0000 (21:06 +0100)

Trivial merge